Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix constraints on from_json() for strings (fixes #3171, #3267, #3312, #3384) #3427

Merged
merged 1 commit into from
Apr 8, 2022
Merged

Fix constraints on from_json() for strings (fixes #3171, #3267, #3312, #3384) #3427

merged 1 commit into from
Apr 8, 2022

Conversation

falbrechtskirchinger
Copy link
Contributor

@falbrechtskirchinger falbrechtskirchinger commented Apr 6, 2022 •
edited
Loading

Constrain from_json() overload for StringType to not accept json_ref and require it to be assignable, instead of constructible, from basic_json::string_t.

Re-enable C++14 tests on Clang <4.0.

Fixes #3171.
Fixes #3267.
Fixes #3312.
Fixes #3384.

@falbrechtskirchinger falbrechtskirchinger changed the title Further constrain from_json() for strings (fixes #3171, #3312, #3384, maybe #3267) Further constrain from_json() for strings (fixes #3171, #3267, #3312, #3384) Apr 6, 2022
@coveralls
Copy link

coveralls commented Apr 6, 2022 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling ebab61e on falbrechtskirchinger:fix-from_json into 15fa6a3 on nlohmann:develop.

@falbrechtskirchinger
Fix constraints on from_json() for strings
ebab61e 
Constrain from_json() overload for StringType to not accept json_ref and
require it to be assignable, instead of constructible, from
basic_json::string_t.

Re-enable C++14 tests on Clang <4.0.

Fixes nlohmann#3171.
Fixes nlohmann#3267.
Fixes nlohmann#3312.
Fixes nlohmann#3384.
@falbrechtskirchinger falbrechtskirchinger changed the title Further constrain from_json() for strings (fixes #3171, #3267, #3312, #3384) Fix constraints on from_json() for strings (fixes #3171, #3267, #3312, #3384) Apr 7, 2022
@falbrechtskirchinger
Copy link
Contributor Author

falbrechtskirchinger commented Apr 7, 2022 •
edited
Loading

This includes unit tests for #3171 and #3312. #3384 doesn't need one and #3267 involves another library (Eigen). I verified on Compiler Explorer that it is indeed fixed.

Edit: Removed Compiler Explorer link referencing deleted branch.

@falbrechtskirchinger falbrechtskirchinger marked this pull request as ready for review April 7, 2022 16:55
nlohmann
nlohmann approved these changes Apr 8, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Apr 8, 2022
@nlohmann nlohmann added this to the Release 3.11.0 milestone Apr 8, 2022
@nlohmann nlohmann merged commit 261cc4e into nlohmann:develop Apr 8, 2022
@falbrechtskirchinger falbrechtskirchinger deleted the fix-from_json branch April 8, 2022 08:33
@nlohmann
Copy link
Owner

nlohmann commented Apr 8, 2022

Thanks a lot!!!

This was referenced Jul 28, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregmarr gregmarr gregmarr left review comments

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🐛 bug fix
Projects
None yet
Milestone
Release 3.11.0
4 participants
@falbrechtskirchinger @coveralls @nlohmann @gregmarr